More small SUnit refactorings