Various fixes for CI test implementations.
Updated TODO per recent developments.