moved 'controller' tests to 'functional'