- fixes from tests
- fixes from tests