Fixed bug. Added basic tests
More tests
Picks number only when nessessary