#JC-1353 tests fixed after review