Add option getters, clean tests.