Corrected tests failing when run all at once.
Fixed master issue reported by @controlflow.
Updated behavior to remember defaults (as suggested by @controlflow).
Some refactoring.