Rewrite of rspec stuff