Some unit tests for newly added functionality
Fix test structures for new interface structures
More unit tests for recently added functionality