Reintegrate testScreenshotUpdate
Move private methods to bottom of class

Also adapt comment as we test this on the emulator now