Remove unused imports
Add start of basic unit tests for Keyword form