Stepped version in build script
Replaced Regex.Match with  String.Contains in Expect methods