EST-416: tidying up integration tests, to use nested static classes.

There are no instances of LocalDate.now() to fix.
EST-439: decouple RemoveEvent using the put/get hash