Move logging and testing utils out to their own packages, and changed files using them to suit
Initial check-in