Moved test objects to correct namespace