UPDATED layout of the unit tests.