Improve option support & tests for key-value trees