simplify and finish tests on ProcessReplacement
Merge branches 'master' and 'refactor'