work on tests
improve tests