Fix acceptance test
Cleanup rspec tests