Bug 23284: Remove test duplication