* Run clang-format on test code * Fix format test * Don't pack arguments * Use more descriptive variable names