Fix broken unit-tests
Update BuildSystem and version info