Merge "Separate shutdown and stats after shutdown tests"