trying to fix and add to unit tests issues with keys in MA calculator