User tests now pass again.

There is still a refactor needed on the users packages to have it make a little more sense. But it looks like we are on the right tracks again. This has caused changes elsewhere in the code base though.