Add more tests for issue #16