(part 2) Rename tests and expand them.