New template implemented and test updated to reflect this.