SLING-3156 - add tests before making changes (which we might not make in the end but that's another story ;-)