Better completeness test