Disabling tests during refactoring
Refactor to leave only the principal objects needed by user-simulations in the 'root'
Refactor to leave only the principal objects needed by user-simulations in the 'root'