Resolve restrictive upper bounds, and broken test suite