Changes to support tests to support issue #15