Add UTF8 charset meta tag to layout
Rename test file
Mapped source to test cases