Working on making a better test suite.