Fix tests
Revert "Fix tests"

This reverts commit 4cfd2b0033342e42164cc2bfb8b0a90f8d893e11.
Merge branch 'fix_comments_decode'