Refactor variable names
Add more test cases