Adding waits in a desperate attempt to get test_browser_cell_data passing

Includes rwood's improvements as well.