Upgrade the tests to use the new constants module