Fixed issue caused by removing un-needed template file and added test