Updated user, tests and shop