Added more tests, a new logic keyword, and a type