Updated comments and names in tests.