Refactored tests screen