Fixed functional rspec tests