Experimenting with expect syntax in rspec
Changed Rspec from should to expect syntax and DRY'd it up, also upped coverage