Cleaned up controller namespacing in tests