Improved test_helper