Finish documenting options
Add some tests