Add checkbox test. Fix some of the other tests that were failing
randomly.