Added test config to build directory
Merged conflicts and updated koohar submodule
Updated koohar library