Multiple Dex Support - part 4

 - add unit tests
 - minor cs fixes