make sure that we always use the right user
add additional tests for the trash bin
adjust encryption tests to the trash bin changes