[bcl] Fix System tests.