Server working, ServerStoreTest green

Change-Id: I115d6e061c8d92e357655a0de6d4da4474e8085d