I think you have them banged to rights either way as it was their job to change the cistern and leave the environment safe and suitable. I doubt anywhere on their paperwork it says you were to sort out the old cistern Everything else would be implied by that omission.