code review: check for exceptions by asking futures. Also collapse 2 tests