Workaround to fix User.py

And some updates from fail to skip