This is a refactoring of #5925, the least we can do to follow best practices on the testing side (à la TDD, tests shouldn't be enforcing improper, consensus-conflicting, behavior).
Hence, this PR is limited to test corrections only, setting up the stage for MAX_MONEY refactoring at some future point in time as per sipa's suggestion.