Bit of changes in the test unit