Also added a test for 6 samples (now all cases are covered)