Changed [testing]: Use UTF-8
Removed: Some duplicate code