Full test tool

Put together the two modules of the test tool.