more test suite refactoring, update submodule