EST-433: Tidy up and creating tests