Can we move this out of the core and into a FUN test.