Add user fields and cover it with simple tests.