tidy up of naming in test