Updating CMakeLists
Updating test source