Move to a static storage method for the currently logged in user
Move tests to reflect static user storage
Merge branch 'feature/static_user' into develop