test cleanup for "one assert per test" - removing duplicates; formatting
test cleanupt for "one assert per test" - split tests