Rspec+improvements