Reorganising unittests