Corrected DocBlock and removed some trivial tests