updated CMake to use eriol as lib and modified test files