recovered from last push; modified test to use constants