#404: refactor downstream tests