Updated submodule tests merge