Fix broken ana tests and add tests for vendor