Organized more tests, fixed a few things

Moved a lot of tests to a high-level of where they should be organized
(stuff moved to administration folder didn't get organized more than
that); renamed the logout story to have zzz in front so that it runs
last