add controller specs
Fix the tersts
Merge branch 'master' into add-travis