Added tests for Utils and more tests for OptionsStore. Also made some changes that came from these tests.