Rename remaining tests