make doctrine json storage plugins more testable -more fixes