refactor sync into one object, add timeout of 20s for all tests