Cleaned up tests.
More refactoring of common code.
Began to move process/setter to common option.