A little bit of rework based on app rspec tests