moved all tests to rspec -- all subtract passing