adjusted EnumExercise & EnumExerciseTest