Minor fixes and code review for vendor extensibility test suite