Updates for User and Utility tests