Absolutely still not worth the refactoring right now for the sake of same-name unit tests. Also an unnecessary constraint in the build. The per-unit options for starsha (yet to come, I know) should be able to override expected unit test names. Capturing the metadata is the better fix.