Tidy up skipped tests

It's now possible to get a clean run of rspec with no skips :)