Revert changes to test case to avoid conflict with 4.x branch