start rewriting unit tests in a more orderly fashion.