Fix tests
Ignore futures that are already done
Merge branch 'master' into fixtests