Fixes for fullscreen unit test (potentially?)