Update screens and tests