New screen tests, refactors while testing