Renamed variables to be more verbose, added comments
Added two more tests for InjectTemplateListener