Unitest fix