Refactoring beans.
Refactoring done.
Bugs fixed.
Added comment manager tests.