Merge "SF: Adding test and unittest folders to CMakeLists.txt"