Added stuff to expression tester