Added two more high-level tests.

Refactor and expand helper class.