Minor changes

+ De-flakified the tests
+ Moved the error messages around
+ Correctly pluralising
+ Refactoring