Add more keywords and a new test case

Awesome! I could do this all day :)