Update tests for User and Track