fix UnitTests