More comments & tests added