adjust indentation and naming
merged conflict test_helper