upstream and tests