Start to fix tests for non-100% zoom.  beforeAll does not propagate exception though.
Minor cleanup.