rename tests, work on tests