Moved constants into classes and updated code to use class constants
Updated unit tests