M4 fixes. Future.immediate replaced with Future.value. Tests passing