claeanup test code
move to mockutils