Fixes tests.
Removes unused comments.