Merge "Add some more tests & tweak spec around SMPTE2094-40"