Rename tests and add some comments