Make handle optional for commenting and fix failing integration test #29