Changed class ChosenMode + added tests.