Fixing tests.
Removing submodules for now; not using them.