Added the beginnings of some unit tests. Also found a fixed a couple of little bugs while in OptionsStore while writing the tests.