[Tests] Fix Makefile for exhand, was not modified for new directory structure.
[Runner] Merge runFixture and runFixtureIfSpecified into a single function.