Tests reorganization. First controller test passes