Improved vendor placeholder; added test cases