More test reorganization.
Fix for issue with restrict checks.