Add test code to handle extender