workign on tests