Added Test counts and a slight rework of the user model module.