Refactor
Updated fixtures