Update Spout with more stringent unit tests