CL bootstrap: tests: fix asd dependency and commit forgotten test files.
CL bootstrap: fix this and that.