Fix specs

Missing require was failing specs when run in a specific order. 
Changes in the rspec syntax meant that some specs were incorrectly marked as pending, fixes this by specifying an argument to the around block, e.g. `around(:each)`
Also cleaned up some of the pending specs which were deplicated.