Fixed test and output of draw_samples