Structure tests

Right, it should not be, and is not anymore.