added future stream recover tests and some cleanup