refactor rspec up to operator app
fix rspec issues