rework the tests a bit