try to fix tests (will be squashed)