Actually fixed submodules...
More fixes for submodules
Test