Changed names of some tests