Fix all states tests