Issue 4145: Fix the tests properly this time