Added new tests.
Added new keywords.
Updated.