Manually fixing templates
Fixed up expectation