Fix technical debt/JUnit on MSB