Slight cleanup of test.  More to come.