Updating, minor changes and expects blocks/__AppTemplates