remove comments and re-add tests