Basic renaming.
Updated test to run more times.