test_utilities tweaks