more unit test futurization