Unit test re ogranisation