Adding testing tools