Changing the template read mechanism
Restructuring tests files