[BUGFIX] Failing tests due to new template