Added new variables and keywords
Added a new test.