CMakeLists changes, fixed install and tests