#JC-1188 Some tests were renamed.