Minor templates changes and tests updates and reactication