update tests
handle constants properly