Minor renamings in tests