Refactored fixtures and fixed test break.