Added new files to CMakeLists.txt.

Added new sources and tests to the relevant CMakeLists.txt files.

NOTE: This works for me but I am not a cmake expert.