constants refactor
test