Reorganize tests directory structure
Update submodule reference
one more commit