Adjust tests to use new constants module