More colorful test object.
Cleanups of options + bug fixes.