Add FitnessTestBuilder and Edit FitnessTestTest