Cleaned up, controller test class removed