A few cleanups to tests