Small fixes for watir tests