This is now handled by our test mainline