CalcDirIncludeFilter test refactored