Cleaned up test/test_helper.rb a bit