Do not handle struct arrays
Clean up tests