WIP fixing up tests for new survey check architecture