bug fixes
fixed tests
Merge branch 'master' of github.com:MattiasFestin/symphony-injector