Tweak test parameters
Add merge function to tools

I also added a pretty good set of tests for it.
Add options merging to FileStore