Merge "Add back testCreateAndManageUser"