Unittest structural changes