Update templates, move test data