might fix the generated test mix ups?

:thumbsup: