improved it tests, removed self implemented Future