work on tests
fix test conflict