Fixing unit tests after changes in modules. Builds now but there is still some errors.