fix broken tests, update mocha and rspec too