Test and statistics improvements
Test and statistics improvements