Fixed the tests and also moved around the constants.