Yeah, I wondered why they were constants in the original tests. Inlined them now.