Fixes. Tests