Moved UnitTests to Integration folder
Added OnResolved; Moved Substitute to IMappingExpression