Added all keywords. Resolved majority of tests