Added user setters and getters, and tests for them