some tests refactoring
some tests refactoring
Process state refactored