working on tests again