Move test harnesses under test

Adjusted include paths