#42 introduced extra tests to hopefully fix bug