Tweak gitmodules, comment code
Remove obsolete test file