Small fixes for rspec test