Change Models(final), add third type of exercise and tests for it