#JC-1632 tests renamed.