Adding decoupled invocation - tests are red, but builds and shape is right
remove accidentally added temporary files
Adding message mapping into decoupled invocation tests