Slightly refactored testing of problem 25.