new complex tests for eval, one still not working
Merge remote-tracking branch 'origin/master'