More comments/test cases