Remove TestData and move fields to user