State2 -> Fix last remaining unit test.