Issues #167 #168 trying to fix the controller test