Made tests independent of each other
cleaned up json formatation, removed unused code (commented for now)
Added test data for nesting, also mock for test