Templates updated, started tests