Submodule split, add basic HUnit tests