Handle case where template has T or P in it.  Fix tests for index to use new start/stop notation