user class fixes and tests