Tweaks and added test file template.
Renamed template files.