updated test suite
refactored/tided controllers