Minor refactor to Testing.

Summary: