Minor changes to fix bugs

Plan: Change from TestController to TestDatabase