Refactor tests to use fixture dependency injection