more tests for stateevaluator, fix found issues