Rspec upd

Update to RSpec 3 and remove Mocha gem
Small refactorings