replace leftover hardcoded values in tests with macros