Even more cleanup

And a few more tests to boot.
++Testing Submodules