DC21-564: Tidy up tests and update RIF-CS key