Refactored and added User tests. Added Ability tests