Forgot to add the tests for issue #18