Reindent according to TODO (indent was reserved to minimize the diff)
Remove unused variable
Rewrite merged tests to use context managers