Updated the tests to work with the new enum namespacing