Fixes #55 base tests.
Merge pull request #56 from ddevore/wip-55-estest

Fixes #55 base tests.