Cleaned up some additional test garbage.