No issue with this, but elsewhere I think we've just been doing export all ifdef TEST. Thoughts?