Plugin storage service renaming
Fixed unit tests