reworking the tests a ton