More test. Will add details when data structures are clear