Add utility classes for easier testing.