Updated multi module build with some classes and tests