updates: rspec 3, passing tests