Converted test to JUnit4
Hacked with the map