Unit test fixing