move tests to rspec
further simplification