Cosmetic changes, some tests added.