Refactored test_utils. #85
Refactored test_utils