Refactor tests
Refactor tests
Fix for non-existant user