Revert "move test tools to main code to make it useable by other applications."

This reverts commit 919c4ae22044b8185a55a16292078f3c894bd3a6.