Merged in Dvydra's changes.

Ability to run a single test.