We're keeping backwards compatibility right? If so we should probably duplicate the test for the new case.