cleaned UnitTesting