Update test site fixture and tidy up collection edit display