updated rspec organization and stubbing