fix tests
merge unstable into browser - fix tests