Don't use test_util when it isn't needed, and when it is needed, use the

Don't use test_util when it isn't needed, and when it is needed, use the #2181