Fix test case: loading from output file. Also fix the sample output file! Had not been updated for Nick's changes. Include more asserts to make clear expectations (Sorry Terry).