fixed unit tests
normalized the store API between client & server