Test structure conforming to lib structure.
More changes to test structure