Clenup and refactor
More tests of controlers