Adding tests for issue #27