Add vendor libs instead of submodules.

Fix a minor error in the unit-tests.