Fixed tests.
Merge branch 'master' into joker
Added joker set setup, made 5/3/1 variant labels bold..