Better behavior when dealing with domains, refactoring test suite to introduce new needed concepts for better grid testing
Removed non-used options