more tests for #16.  all now pass except one