Tests now passing locally. I have finally settled on the structure of the splash stream.