Add new unit tests for key store