Converted remaining templates to new format.

updates to clean.sh and test.sh for testing