fix tests
Merge unstable into browser