Add generic tools for testing