Bugfixes for parser, add some functionality
Bugfixes for parser, add some functionality

Add distinction between combine and replace, fix bugs 
akashkw/smi-test-automation,MichaelRegert/smi-test-automation