Added debugging traces in custom CI tests.
Updated TODO per recent developments.