More class SUnit comments and refactorings