Adding testing capabilities