Merged tests back together.

See title.