Use collective.betterbrowser for tests
Merge remote-tracking branch 'upstream/master'

Use collective.betterbrowser for tests.