Improve 81-testing