Move test harnesses under test

Adjusted include paths
Merge pull request #272 from nschonni/move-test-harness

Move test harnesses under test