Adjust some timings and where validations happen try to make browser tests pass on Travis-CI.