rewrote almost all the rest of the tests
renamed test base classes