Fix test bottlenecked by random string generation

All results invalid.
WIP bugfixes