User fixes and tests