Add keywords
Update test cases
Fix tests for windows