Change tokensOnHand to vector, pick specific token.

Add test for picking specific token.
Small refactoring,