Cleaned up CMakeLists, added back relevant tests.

- Requird addion of timer.{h,cpp}