Adding structural tests