Revert "split struct-test (#141)"

This reverts commit 22fd3c747b75fada371c480d1d803c714cb0be4a.