Fixed tests for Windows
Supported instance injection