JP: Adjusted Tests for Distributed cache
J: formatting