use more constants in tests

based on feedback from other pull reviews.