Made repaint tests less brittle (they are more functional anyway).