move view test to controller test; #88 #90
Merge branch 'Axolotl' into A/feature/#54