Minor changes to tests and comments