Integrate tests from cl-99-test.

Adjust the folder structure.