Still need value sets in test measure JSON for calculation code

When I removed the value sets from measure JSON in the code, I did the same in the tests, forgetting that in the tests we use the JSON for generating the measure calculation code as well. Adding the value sets back in on the test side only gets our tests passing again.