Added a few tests, and fix cadr, no such fucntion