Fixed tests
Added controller tests
Added new-lines