Use simpler variable names.
Insert scaffold for remaining tests. (reorder to match code)