Adding extra commands, support for variables and some other stuff to make more testcases run (still not perfect though)