Add more validation + unit tests for keywords & snippets