Bug Matt to find where these limits are set, and update the tests to reflect those limits.