Better test structures
Added controller test