cleaned up tests, added some more