Xoppa comments + ShaderCollectionTest cleanup