Expand coverage of patient builder tests

This adds considerable additional testing to patient builder; part of that includes updating the patient fixtures