Better way of checking include and replace adjustment is from the same calculated module
and test name fixes
Merge branch 'version-0.02'