Added template engine classes / tests