Update spout tests to be more stringent