clean up tests a bit and add comments