Merge "some improvements for browser test harness"