Merge "SF: reduce timeout for unit tests"