Clean up some base tests.