Merge "afm-unit conf: Remove useless tests"