Fix Trash e2e test

Updated tests to latest definitions of Trash. Also added local storage-server login.

@EnlightenedCode @tejohnso please review