Revert "remove unused teardown function"

This reverts commit 04dd451db089b4d927cc505510591efb394786ff.
move instantiate accounting for tests into a base test case so that they work in travis...hopefully.