Further migrated from option set to results.
Removed builder class.
Removed low-level tests.
More refactoring of tests.