remove futures test, fix bugs