fix browser tests
Merge unstable into browser