Adjust tests and comments