Test and statistics improvements