12d8d59
Merge fixes for unit testing Recent changes in wrapper injection broke some tests which is fixed by this commit series.