Cleaned TestScreen for concurrent feature development