Fix up specs with repository dependency and base facts