Updating tests for enum namespacing