Start fixing up tests for Participant