Rename comment parameters
Add methods to test for error/success