- Improved CMakeLists.txt
- Added test to CMakeLists.txt