work on tests
bugfix