Fix unit tests that were broken due to pixel/data area distinction getting confused