Add more tests to cover various cases
Add keywords