Structure tests

Is this class necessary?