clean up
structure tests