Fix more tests and remove stats incrementing.