Fixed UnitTests