Add more specific exceptions to Square
Re-package model tests