More keywords, test cases, libdocs