Add extra tests to check for issue #142