Improve fixture data and refactor accordingly