improvement in nomenclature and new tests