JCR-2355: Add a debug message
JCR-2355: Add a debug message in the asserts that fail
JCR-2355: Revert changes