Add more test HOT templates
fixes user creds
Update test templates
Add more test templates
Add more test templates