.......... [DEV-532] updated unit tests to work with the latest value cache changes