add tests, remove auto-generated comments