Add tools for simple test