Implement review suggestions
Add unit test for 401