adjustment to new structType and m3 tests added