Fixed more tests. But this does not handle reqursive structures. Some major changes is needed for that