Additional fixes to get tests to pass

Ongoing work following #35 and #31.  Incrementally getting there...