- Fixed a few inconsistencies and bugs along the way - User manager tests need some equivalent fleshing out