changed tests and template application