897: Manan/Paddy - Fixed JSON parse of content, updated vendor mapping attributes, fixed invalid vendor case and functional tests