Changes to support existing tests. Fixes #107