Apple has announced that they will now replace battery for only $35 (regular price was $99) for iPhone 6 or newer. It will not run a diagnostic test – it will just replace the battery. Your iPhone does not need to be under warranty for this replacement.