Added some more tests and fixed not being able to evaluate nil