Test cases cleanup.
More cleanup.
Merge branch 'feature-test-cleanup' into develop
Added "doResourceOptionInitialization".