Wrote unit tests for the corresponding classes and created json files for sample data
Merge remote-tracking branch 'origin/master'