remove last references to the distributed shell from the retained evaluators unit tests; minor refactoring (use chained configuration builder calls) etc