More test, added some controller test