reworking the unittests