A couple of renamings in the tests