Modified to take in account Xoppa comments + cleanup in
ShaderCollectionTest