Continued JSON dataLoader. Also added JUnit to the build (till now all the tests were non-JUnit).