Merge "Fix volume test copyrights"