Fixed template parsing issues with tests, fixed increments