Add more test coverage
Add user following