Merge "Improve 32K limit tests"