Added a TestHelper class for abstracting testing helpers
Fixed up namespacing issues