Update tests to use normal/long harness timeouts