M4 fixes

Replace Future.immediate to Future.value. Tests passing.