OutputMapping refactaring MainTest add