Avoid string concatenation during input generation
started to rewrite tests