Tidied up test entity creations.