Some small fixes in the test tool.