Refactored fixtures and added vendors fixture