added the tests back, slowly
more tests