Small modifications on FocusEvents and KeyValueStore tests