test for #136 and #137, ready for review