*8888* Disabled broken tests; test fixes
*8888* Submodule update
*8888* Submodule update