do-screen-state-test improvement