Changed constuctor parameters of some classes so we don't have to provide PU for everything.
Wrote some additional tests and changed the way a Shop instance is obtained.
Fixed merge conflict in UserRegistryTest.