submodule update and cleaned up testing