#161 Use - as a replacement token for the branch normalisation in templates - correction of integration tests