[FIX] MCN processing, added unit tests