minor cleanup
started FirehoseTest