Added a little more validation to tests.