Str\replace*, tests files renaming, bit of fixes