Follow service more test cases

Added some test cases and renamed some