updated specs to not have hardcoded project ids
upstream merge