Merge "Update art tests"