clean up testUtils
moved changes from the 1.0.x branch to the master