Fix UTF-8 file issue and test section clean up