Fix namespacing on tests and controllers