No ticket: Reduce size in anticipation of Sizzle-free builds
(cherry picked from commit dbf3056b250bbc279fa947031181f9e25a40bacf)
No ticket: Revise unit tests in anticipation of Sizzle-free builds