Fixes #1322
Fixes 1325
Fixes #1321
Fixes #1324
Fixes #1326
Fixes #1327
Fixes #1321
Fix intermitent failures
More Fixes for #1325
Add auto detection of Injection Framework