Update tests to ensure they do not timeout