Continued cleanup of tests. All are passing now, and validator tests are a lot more DRY.