Minor cleanups to test