Tidy previous test (and add comments)