Merge "Fix broken tests and add tests for empty state screens."