Fix racy unit tests, discovered by Jenkins
Update generated files