loosen wait for template deployent timeout
update migration tests