Fix tests

Tests are ok now