Preparing for better release bundle
Fix error tests