[WIP] Browser Testing Fixes