fixed some tests due to modifications of the templates made earlier