Identified templating miscommunication, tests++