Fixes the tests to work around the inability to depend on namespace ordering.