EST-271 Further removing setup data from fixtures