Move the initial_data fixture to the right place