Adding testing infrastructure