Adjustable template paths
Better unit tests and a minor regex matching change