Refactor screen and screen tests