tools: move the remaining tools from test to here