Fix user#folder - Fixes #168
Fix user test