Added a few dozen more tests to this pretty important part of the proggy.