Further cleanup + test passing

I had indeed not tested it, and winged it in the browser. My apologies. Did some further cleaning up.

* less method calls
* Removed confusion between Browser and ::Browser by being more explicit
*