Fix required sample count tests