Bugfix + more test cases + evaluation of double expressions