Moved the tests around by namespace so that they came out better in Nunit