finished the move from M[_] to Future everywhere and moved from the deprecated MustMatcher to new Matcher