Removed redundant tests.
Merged test option sets.