Fix display of replication target types in text field
Tidy up test files