submodule test

Merged test with submodules into master