Fix non-regression tests
Avoid allocating strings where not necessary
Merge remote-tracking branch 'origin/master'