Changed unit tests to use constants