Clean up testing, add controller test