Fix test failures
TEMP -- TRACKING DOWN TEST FAILURE
Update ScreenShotListener