more tests & rspec3 migration