Junit for Control classes + light refactoring