Clean tests + fix user save error handling