The big in-browser tests classes clean-up

Removed lots of unneeded code and simplified some of the remaining.