Fixes to tests generator.