Added further tests #57 should be fixed now.