Fixes to tests affected by changing contributors in factories