Removed timeouts from tests and fixed up require paths