Tests + last gsub changes