Continuing refactor of controller now adjusting tests