Cleanup of stats and additional test