Fixed some bugs with cmakelists. Added more tests.

No match.