Changes for the DIL testing

This pull request contains changes we made for the DIL testing.