Enhancements to Eval2Member & Member2Eval Rules

Resolves issue #601 #602 and #603 

The result of the smokes tests, after the changes can be found @ https://github.com/AmeBel/test-datasets/tree/tests-after-change