Modified for changes/fixes to 3.12 CSR image. Some tests broken on full run