Added some more unit tests for various other complex data structures