Resolve issues from testing