Unitest improvement