Get patient tests passing
Simplify handling of singleton subrecords