mo tests, mo fixes
merge in AtnNn's changes