renamed tests, updated to have timeout