GH #6 - Updated unit tests to JSON related steps.