Added yet more tests for betterpicker.