Prettified rspec tests and various tidy