Fixes #63: reworked test cases for #63 and #64