Controll class added, unit test refactored and new ones are written. Integration tests are missing.