Add in nma support - test