fix tests, refactor comment policy
refactor comment policy and controller