TestSpecs/gen: resolved bugs in generation scripts