Clearer test message, as used in core

Change-Id: I9cae998c3a492a5ba4ae8e70d65b2f6ed0438f13
Merge "Clearer test message, as used in core"