Changed unit tests layout