Repair errors in tests
Changed tests
Tests update
Tests update