Adjust tests to m_getfld2() and write some more