Update tests and increase the test timeout