Refactoring specs to DRY them up a bit

Been reading http://betterspecs.org/ recently and I thought I could implement a few ideas...

Just opening a PR to see if Travis doesn't barf, then I'll merge...