fix UnitTests

UnitTests fail #506