CORE-5832: removed some test code that was no longer needed