Merge "Added UserController tests for continuous testing"