Continuing refactor of controller now adjusting even more tests