Unit test improvement