Bug 24735: Remove more code from tests