rspec3

a lot of changes, but luckily all in tests