move constant and add unit test