Added couple of new files in the new testutils module missing in the last commit