Adding tests for issue #68