Small changes
Refactored test main controller