State errors solved
Test issues solved