cleaned: tests; added: 'class' storage object