Updates to Pre and Post test screens