Fixed some test failures
Future and latch niceness