Finagle some return statements
Finish up UserStorage tests