revert broken async testing stuff, fix masked test failures