Fixes, improvements and disablements to Trade tests