Add both regular nor and m18 tests to test harness