Refactor browser testing, using testling