repassign submodule and fixes to testing