Adding testing, adding timeout