Add some testing for the new handling of extra().