Changed test app submodule path
Removed test_app dir from .gitignore and added submodule to repo
Fixed submodule config conflict