Added "components" to test classpath
Changed tests to sort the resulting map before comparing the results, because Map element order is undefined
Sorted the expected values in the test files
Merge remote-tracking branch 'origin/master'