Fix user fixture data and more