reworking the tests