Converting to template
Paramaterize a few options and template them
Adding more smoke tests