Fixes for stale test screen