Unittests reworked