rewrote a bunch of the tests and removed some