Refactored to use json file fixtures