Added sourses and tests encoding resolution