Work on tests
Controller WIP