Improve User Unit Spec