Added a few tests and keywords