Some changes to remove warnings. And More test cleanup.