Yes. Sit-ups have been removed from the fitness test and HRPs are now utilized for the APFT. This is subject to change, and talks of switching back to traditional push-ups is already in the works.
Take your time dude! Don't rush with aggressive fitness at your age. You're body is still growing. You can be easily injured. Have a good coach to guide you. Health and strength to you!