Fixed some namespace issues with the unit test project