Added tests
Allowed alternative location for .json file