Merge "Fix art tests"