Update Tests + Screens added