Fix for 404 test
Fix for user test