Revert "clean-up tests"

This reverts commit 0a1ae81edcb020d226e66309af13809c40c802fc.
latest