Update tests for use of storageService