WIP: Move data to fixtures