Cleaned up some test initialization.