Added more tests, changed JSON traversing method