Ticket #6164: Added test case that now works (failed in 1.66).
Merge pull request #431 from simartin/ticket_6164_test

Ticket #6164: Added test case that now works
Refactoring tests. Use utility function to warn about unsimplified code in tests.