A few minor test updates to match helper method names
Merge branch 'master' of https://github.com/dgrant069/Grubly into nick