Finished problem 19.

Cleaned up a lot of the test naming.